debian: Use dh 13 substitutions for install files instead of .in files

diff --git a/debian/gir1.2-gtk-4.0.install b/debian/gir1.2-gtk-4.0.install
index 9038727d6e0080cf3aa7ca11c3c0d25cb9dc6f35..6ec97965c4d7dc80b67295509a93386a11f7e79c 100644 (file)
--- a/debian/gir1.2-gtk-4.0.install
+++ b/debian/gir1.2-gtk-4.0.install
@@ -1 +1 @@
-usr/lib/*/girepository-1.0/
+${env:LIBDIR}/girepository-1.0/

diff --git a/debian/libgtk-4-1-udeb.install b/debian/libgtk-4-1-udeb.install
index 62e7ea4de856b6ec25c58e7906ff396944148903..66c6b91eab9a27429ba8303852f5698e2bce91cd 100644 (file)
--- a/debian/libgtk-4-1-udeb.install
+++ b/debian/libgtk-4-1-udeb.install
@@ -1 +1 @@
-usr/lib/*/libg?k*.so.*
+${env:LIBDIR}/libg?k*.so.*

diff --git a/debian/libgtk-4-1.install b/debian/libgtk-4-1.install
new file mode 100644 (file)
index 0000000..410a049
--- /dev/null
+++ b/debian/libgtk-4-1.install
@@ -0,0 +1,2 @@
+${env:MODULES_BASE_PATH}/printbackends/*.so
+${env:LIBDIR}/libgtk*.so.*

diff --git a/debian/libgtk-4-1.install.in b/debian/libgtk-4-1.install.in
deleted file mode 100644 (file)
index 8df8b20..0000000
--- a/debian/libgtk-4-1.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-@MODULES_BASE_PATH@/printbackends/*.so
-@LIBDIR@/libgtk*.so.*

diff --git a/debian/libgtk-4-1.links b/debian/libgtk-4-1.links
new file mode 100644 (file)
index 0000000..29003eb
--- /dev/null
+++ b/debian/libgtk-4-1.links
@@ -0,0 +1,2 @@
+usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@SHARED_PKG@/@NEWS@
+usr/share/doc/@COMMON_PKG@/@README.md@ usr/share/doc/@SHARED_PKG@/@README.md@

diff --git a/debian/libgtk-4-1.links.in b/debian/libgtk-4-1.links.in
deleted file mode 100644 (file)
index 29003eb..0000000
--- a/debian/libgtk-4-1.links.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@SHARED_PKG@/@NEWS@
-usr/share/doc/@COMMON_PKG@/@README.md@ usr/share/doc/@SHARED_PKG@/@README.md@

diff --git a/debian/libgtk-4-bin.links b/debian/libgtk-4-bin.links
new file mode 100644 (file)
index 0000000..c68573e
--- /dev/null
+++ b/debian/libgtk-4-bin.links
@@ -0,0 +1,2 @@
+usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@BIN_PKG@/@NEWS@
+usr/share/doc/@COMMON_PKG@/@README.md@ usr/share/doc/@BIN_PKG@/@README.md@

diff --git a/debian/libgtk-4-bin.links.in b/debian/libgtk-4-bin.links.in
deleted file mode 100644 (file)
index c68573e..0000000
--- a/debian/libgtk-4-bin.links.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@BIN_PKG@/@NEWS@
-usr/share/doc/@COMMON_PKG@/@README.md@ usr/share/doc/@BIN_PKG@/@README.md@

diff --git a/debian/libgtk-4-common.install b/debian/libgtk-4-common.install
new file mode 100644 (file)
index 0000000..41ebd4f
--- /dev/null
+++ b/debian/libgtk-4-common.install
@@ -0,0 +1,3 @@
+usr/share/glib-2.0/schemas/org.gtk.gtk4.Settings.*.gschema.xml
+usr/share/gtk-4.0/emoji
+usr/share/locale

diff --git a/debian/libgtk-4-common.install.in b/debian/libgtk-4-common.install.in
deleted file mode 100644 (file)
index 41ebd4f..0000000
--- a/debian/libgtk-4-common.install.in
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/glib-2.0/schemas/org.gtk.gtk4.Settings.*.gschema.xml
-usr/share/gtk-4.0/emoji
-usr/share/locale

diff --git a/debian/libgtk-4-dev.install b/debian/libgtk-4-dev.install
index 97cef6b2f1191eaac162c2ff99024d54c74ea5dd..2d01bcee15f221e792591b0576c878511d271b6b 100644 (file)
--- a/debian/libgtk-4-dev.install
+++ b/debian/libgtk-4-dev.install
@@ -1,6 +1,6 @@
 usr/include/gtk*
-usr/lib/*/libgtk*.so
-usr/lib/*/pkgconfig/g?k*
+${env:LIBDIR}/libgtk*.so
+${env:LIBDIR}/pkgconfig/g?k*
 usr/share/gettext/its/gtk4builder.its
 usr/share/gettext/its/gtk4builder.loc
 usr/share/gir-1.0

diff --git a/debian/libgtk-4-dev.links b/debian/libgtk-4-dev.links
new file mode 100644 (file)
index 0000000..3482084
--- /dev/null
+++ b/debian/libgtk-4-dev.links
@@ -0,0 +1,2 @@
+usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@DEV_PKG@/@NEWS@
+usr/share/doc/@COMMON_PKG@/@README.md@ usr/share/doc/@DEV_PKG@/@README.md@

diff --git a/debian/libgtk-4-dev.links.in b/debian/libgtk-4-dev.links.in
deleted file mode 100644 (file)
index 3482084..0000000
--- a/debian/libgtk-4-dev.links.in
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@DEV_PKG@/@NEWS@
-usr/share/doc/@COMMON_PKG@/@README.md@ usr/share/doc/@DEV_PKG@/@README.md@

diff --git a/debian/libgtk-4-doc.install b/debian/libgtk-4-doc.install
new file mode 100644 (file)
index 0000000..a138dd6
--- /dev/null
+++ b/debian/libgtk-4-doc.install
@@ -0,0 +1,5 @@
+usr/share/doc/gdk4 usr/share/doc/${env:DOC_PKG}
+usr/share/doc/gdk4-wayland usr/share/doc/${env:DOC_PKG}
+usr/share/doc/gdk4-x11 usr/share/doc/${env:DOC_PKG}
+usr/share/doc/gsk4 usr/share/doc/${env:DOC_PKG}
+usr/share/doc/gtk4 usr/share/doc/${env:DOC_PKG}

diff --git a/debian/libgtk-4-doc.install.in b/debian/libgtk-4-doc.install.in
deleted file mode 100644 (file)
index 1859211..0000000
--- a/debian/libgtk-4-doc.install.in
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/doc/gdk4 usr/share/doc/@DOC_PKG@
-usr/share/doc/gdk4-wayland usr/share/doc/@DOC_PKG@
-usr/share/doc/gdk4-x11 usr/share/doc/@DOC_PKG@
-usr/share/doc/gsk4 usr/share/doc/@DOC_PKG@
-usr/share/doc/gtk4 usr/share/doc/@DOC_PKG@

diff --git a/debian/libgtk-4-doc.links b/debian/libgtk-4-doc.links
new file mode 100644 (file)
index 0000000..0387789
--- /dev/null
+++ b/debian/libgtk-4-doc.links
@@ -0,0 +1,16 @@
+usr/share/doc/${env:DOC_PKG}/gdk4 usr/share/doc/${env:DEV_PKG}/gdk4
+usr/share/doc/${env:DOC_PKG}/gdk4 usr/share/gtk-doc/html/gdk4
+usr/share/doc/${env:DOC_PKG}/gdk4-wayland usr/share/doc/${env:DEV_PKG}/gdk4-wayland
+usr/share/doc/${env:DOC_PKG}/gdk4-wayland usr/share/gtk-doc/html/gdk4-wayland
+usr/share/doc/${env:DOC_PKG}/gdk4-x11 usr/share/doc/${env:DEV_PKG}/gdk4-x11
+usr/share/doc/${env:DOC_PKG}/gdk4-x11 usr/share/gtk-doc/html/gdk4-x11
+usr/share/doc/${env:DOC_PKG}/gsk4 usr/share/doc/${env:DEV_PKG}/gsk4
+usr/share/doc/${env:DOC_PKG}/gsk4 usr/share/gtk-doc/html/gsk4
+usr/share/doc/${env:DOC_PKG}/gtk4 usr/share/doc/${env:DEV_PKG}/gtk4
+usr/share/doc/${env:DOC_PKG}/gtk4 usr/share/gtk-doc/html/gtk4
+usr/share/doc/libglib2.0-doc/glib usr/share/doc/${env:DEV_PKG}/glib
+usr/share/doc/libglib2.0-doc/glib usr/share/doc/${env:DOC_PKG}/glib
+usr/share/doc/libglib2.0-doc/gobject usr/share/doc/${env:DEV_PKG}/gobject
+usr/share/doc/libglib2.0-doc/gobject usr/share/doc/${env:DOC_PKG}/gobject
+usr/share/doc/libpango1.0-doc/pango usr/share/doc/${env:DEV_PKG}/pango
+usr/share/doc/libpango1.0-doc/pango usr/share/doc/${env:DOC_PKG}/pango

diff --git a/debian/libgtk-4-doc.links.in b/debian/libgtk-4-doc.links.in
deleted file mode 100644 (file)
index 5621c97..0000000
--- a/debian/libgtk-4-doc.links.in
+++ /dev/null
@@ -1,16 +0,0 @@
-usr/share/doc/@DOC_PKG@/gdk4 usr/share/doc/@DEV_PKG@/gdk4
-usr/share/doc/@DOC_PKG@/gdk4 usr/share/gtk-doc/html/gdk4
-usr/share/doc/@DOC_PKG@/gdk4-wayland usr/share/doc/@DEV_PKG@/gdk4-wayland
-usr/share/doc/@DOC_PKG@/gdk4-wayland usr/share/gtk-doc/html/gdk4-wayland
-usr/share/doc/@DOC_PKG@/gdk4-x11 usr/share/doc/@DEV_PKG@/gdk4-x11
-usr/share/doc/@DOC_PKG@/gdk4-x11 usr/share/gtk-doc/html/gdk4-x11
-usr/share/doc/@DOC_PKG@/gsk4 usr/share/doc/@DEV_PKG@/gsk4
-usr/share/doc/@DOC_PKG@/gsk4 usr/share/gtk-doc/html/gsk4
-usr/share/doc/@DOC_PKG@/gtk4 usr/share/doc/@DEV_PKG@/gtk4
-usr/share/doc/@DOC_PKG@/gtk4 usr/share/gtk-doc/html/gtk4
-usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DEV_PKG@/glib
-usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib
-usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DEV_PKG@/gobject
-usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DOC_PKG@/gobject
-usr/share/doc/libpango1.0-doc/pango usr/share/doc/@DEV_PKG@/pango
-usr/share/doc/libpango1.0-doc/pango usr/share/doc/@DOC_PKG@/pango

diff --git a/debian/rules b/debian/rules
index 785a65cff307c097a0239eb9960b116ed5a42b4e..0a3b94955a37df492841f824f219cf02cfc76822 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -14,32 +14,32 @@ LDFLAGS += -Wl,-z,defs
 # Make the linker work a bit harder so dynamic loading can be done faster
 LDFLAGS += -Wl,-O1
 
-APIVER := 4
-SONAME := 1
+export APIVER := 4
+export SONAME := 1
 
-LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
+export LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
 
 # earliest version that this release has backwards binary compatibility for
-GTK_BINARY_VERSION := 4.0.0
+export GTK_BINARY_VERSION := 4.0.0
 
 # Gtk binary version virtual Provide
-GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION)
+export GTK_BINVER_DEP := gtk$(APIVER)-binver-$(GTK_BINARY_VERSION)
 
 # relative base directory for configuration
-CONFDIR := etc/gtk-4.0
+export CONFDIR := etc/gtk-4.0
 
 # relative base directory for all types of modules
-MODULES_BASE_PATH := $(LIBDIR)/gtk-4.0/$(GTK_BINARY_VERSION)
+export MODULES_BASE_PATH := $(LIBDIR)/gtk-4.0/$(GTK_BINARY_VERSION)
 
 # package names
-SHARED_PKG := libgtk-$(APIVER)-$(SONAME)
-COMMON_PKG := libgtk-$(APIVER)-common
-DEV_PKG := libgtk-$(APIVER)-dev
-UDEB_PKG := $(SHARED_PKG)-udeb
-DOC_PKG := libgtk-$(APIVER)-doc
-BIN_PKG := libgtk-$(APIVER)-bin
-EXAMPLES_PKG := gtk-$(APIVER)-examples
-TESTS_PKG := gtk-$(APIVER)-tests
+export SHARED_PKG := libgtk-$(APIVER)-$(SONAME)
+export COMMON_PKG := libgtk-$(APIVER)-common
+export DEV_PKG := libgtk-$(APIVER)-dev
+export UDEB_PKG := $(SHARED_PKG)-udeb
+export DOC_PKG := libgtk-$(APIVER)-doc
+export BIN_PKG := libgtk-$(APIVER)-bin
+export EXAMPLES_PKG := gtk-$(APIVER)-examples
+export TESTS_PKG := gtk-$(APIVER)-tests
 
 # files larger than 4k in size will be compressed by dh_compress
 # so append a .gz suffix to avoid dangling symlinks
@@ -55,7 +55,6 @@ debian/%: debian/%.in
        sed \
                -e "s#@SONAME@#$(SONAME)#g" \
                -e "s#@APIVER@#$(APIVER)#g" \
-               -e "s#@VERSION@#$(DEB_VERSION_UPSTREAM)#g" \
                -e "s#@GTK_BINVER_DEP@#$(GTK_BINVER_DEP)#g" \
                -e "s#@SHARED_PKG@#$(SHARED_PKG)#g" \
                -e "s#@COMMON_PKG@#$(COMMON_PKG)#g" \
@@ -66,12 +65,8 @@ debian/%: debian/%.in
                -e "s#@EXAMPLES_PKG@#$(EXAMPLES_PKG)#g" \
                -e "s#@TESTS_PKG@#$(TESTS_PKG)#g" \
                -e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
-               -e "s#@GTK_BINARY_VERSION@#$(GTK_BINARY_VERSION)#g" \
                -e "s#@LIBDIR@#$(LIBDIR)#g" \
-               -e 's#@CONFDIR@#$(CONFDIR)#g' \
                -e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \
-               -e "s#@NEWS@#$(NEWS)#g" \
-               -e "s#@README.md@#$(README.md)#g" \
                $@.in > $@
 
 configure_flags_common = \